From eb10e6b128aba98f24d4d28f9c9501278e1e8c5a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 28 Aug 2010 20:10:02 -0400 Subject: [PATCH] Remove the long deprecated GDK_WINDOW_DIALOG type. This has been deprecated forever, and was just left in for compatibility reasons. --- gdk/gdkevents.c | 1 - gdk/gdkwindow.c | 3 --- gdk/gdkwindow.h | 2 -- gdk/quartz/gdkwindow-quartz.c | 4 +--- gdk/win32/gdkwindow-win32.c | 20 ++------------------ gdk/x11/gdkwindow-x11.c | 11 ++--------- 6 files changed, 5 insertions(+), 36 deletions(-) diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 0eaf7921f4..9d7cbefee6 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -1445,7 +1445,6 @@ gdk_synthesize_window_state (GdkWindow *window, switch (((GdkWindowObject*) window)->window_type) { case GDK_WINDOW_TOPLEVEL: - case GDK_WINDOW_DIALOG: case GDK_WINDOW_TEMP: /* ? */ gdk_display_put_event (gdk_drawable_get_display (window), &temp_event); break; diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 236be0a1ca..0026c424a5 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -1381,7 +1381,6 @@ gdk_window_new (GdkWindow *parent, switch (private->window_type) { case GDK_WINDOW_TOPLEVEL: - case GDK_WINDOW_DIALOG: case GDK_WINDOW_TEMP: case GDK_WINDOW_OFFSCREEN: if (GDK_WINDOW_TYPE (parent) != GDK_WINDOW_ROOT) @@ -1683,7 +1682,6 @@ gdk_window_reparent (GdkWindow *window, case GDK_WINDOW_OFFSCREEN: case GDK_WINDOW_TOPLEVEL: case GDK_WINDOW_CHILD: - case GDK_WINDOW_DIALOG: case GDK_WINDOW_TEMP: if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \ GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN) @@ -2018,7 +2016,6 @@ _gdk_window_destroy_hierarchy (GdkWindow *window, /* else fall thru */ case GDK_WINDOW_TOPLEVEL: case GDK_WINDOW_CHILD: - case GDK_WINDOW_DIALOG: case GDK_WINDOW_TEMP: case GDK_WINDOW_FOREIGN: case GDK_WINDOW_OFFSCREEN: diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index dcc42acdf9..b294095517 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -65,7 +65,6 @@ typedef enum * screen, and is created by the window system * @GDK_WINDOW_TOPLEVEL: toplevel window (used to implement #GtkWindow) * @GDK_WINDOW_CHILD: child window (used to implement e.g. #GtkEntry) - * @GDK_WINDOW_DIALOG: useless/deprecated compatibility type * @GDK_WINDOW_TEMP: override redirect temporary window (used to implement * #GtkMenu) * @GDK_WINDOW_FOREIGN: foreign window (see gdk_window_foreign_new()) @@ -79,7 +78,6 @@ typedef enum GDK_WINDOW_ROOT, GDK_WINDOW_TOPLEVEL, GDK_WINDOW_CHILD, - GDK_WINDOW_DIALOG, GDK_WINDOW_TEMP, GDK_WINDOW_FOREIGN, GDK_WINDOW_OFFSCREEN diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index 12a5adb9eb..2800420622 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -854,7 +854,6 @@ _gdk_window_impl_new (GdkWindow *window, switch (private->window_type) { case GDK_WINDOW_TOPLEVEL: - case GDK_WINDOW_DIALOG: case GDK_WINDOW_TEMP: if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT) { @@ -906,10 +905,9 @@ _gdk_window_impl_new (GdkWindow *window, impl->view = NULL; - switch (attributes->window_type) + switch (attributes->window_type) { case GDK_WINDOW_TOPLEVEL: - case GDK_WINDOW_DIALOG: case GDK_WINDOW_TEMP: { NSScreen *screen; diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 71b3dedc03..ea2a04d7f3 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -401,17 +401,6 @@ RegisterGdkClass (GdkWindowType wtype, GdkWindowTypeHint wtype_hint) klass = klassCHILD; break; - case GDK_WINDOW_DIALOG: - if (0 == klassDIALOG) - { - wcl.lpszClassName = L"gdkWindowDialog"; - wcl.style |= CS_SAVEBITS; - ONCE_PER_CLASS (); - klassDIALOG = RegisterClassExW (&wcl); - } - klass = klassDIALOG; - break; - case GDK_WINDOW_TEMP: if ((wtype_hint == GDK_WINDOW_TYPE_HINT_MENU) || (wtype_hint == GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU) || @@ -492,7 +481,6 @@ _gdk_window_impl_new (GdkWindow *window, g_print ("_gdk_window_impl_new: %s\n", (attributes->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" : (attributes->window_type == GDK_WINDOW_CHILD ? "CHILD" : - (attributes->window_type == GDK_WINDOW_DIALOG ? "DIALOG" : (attributes->window_type == GDK_WINDOW_TEMP ? "TEMP" : "???")))))); @@ -554,7 +542,6 @@ _gdk_window_impl_new (GdkWindow *window, switch (private->window_type) { case GDK_WINDOW_TOPLEVEL: - case GDK_WINDOW_DIALOG: if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT) { /* The common code warns for this case. */ @@ -1061,8 +1048,7 @@ show_window_internal (GdkWindow *window, SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); - else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL || - GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG) + else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TOPLEVEL) { if (focus_on_map && private->accept_focus) { @@ -1399,7 +1385,6 @@ gdk_win32_window_reparent (GdkWindow *window, case GDK_WINDOW_TOPLEVEL: case GDK_WINDOW_CHILD: - case GDK_WINDOW_DIALOG: case GDK_WINDOW_TEMP: if (WINDOW_IS_TOPLEVEL (window)) { @@ -1504,8 +1489,7 @@ get_effective_window_decorations (GdkWindow *window, if (gdk_window_get_decorations (window, decoration)) return TRUE; - if (((GdkWindowObject *) window)->window_type != GDK_WINDOW_TOPLEVEL && - ((GdkWindowObject *) window)->window_type != GDK_WINDOW_DIALOG) + if (((GdkWindowObject *) window)->window_type != GDK_WINDOW_TOPLEVEL) { return FALSE; } diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index bf919cbd15..d601f0e8af 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -598,12 +598,9 @@ setup_toplevel_window (GdkWindow *window, XSizeHints size_hints; long pid; Window leader_window; - - if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG) - XSetTransientForHint (xdisplay, xid, xparent); - + set_wm_protocols (window); - + if (!obj->input_only) { /* The focus window is off the visible area, and serves to receive key @@ -723,7 +720,6 @@ _gdk_window_impl_new (GdkWindow *window, switch (private->window_type) { case GDK_WINDOW_TOPLEVEL: - case GDK_WINDOW_DIALOG: case GDK_WINDOW_TEMP: if (GDK_WINDOW_TYPE (private->parent) != GDK_WINDOW_ROOT) { @@ -809,7 +805,6 @@ _gdk_window_impl_new (GdkWindow *window, switch (GDK_WINDOW_TYPE (private)) { - case GDK_WINDOW_DIALOG: case GDK_WINDOW_TOPLEVEL: case GDK_WINDOW_TEMP: if (attributes_mask & GDK_WA_TITLE) @@ -1426,7 +1421,6 @@ gdk_window_x11_hide (GdkWindow *window) switch (private->window_type) { case GDK_WINDOW_TOPLEVEL: - case GDK_WINDOW_DIALOG: case GDK_WINDOW_TEMP: /* ? */ gdk_window_withdraw (window); return; @@ -1659,7 +1653,6 @@ gdk_window_x11_reparent (GdkWindow *window, case GDK_WINDOW_TOPLEVEL: case GDK_WINDOW_CHILD: - case GDK_WINDOW_DIALOG: case GDK_WINDOW_TEMP: if (WINDOW_IS_TOPLEVEL (window) && impl->toplevel) -- 2.30.2